Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

annotation: avoid comment conflict warning when irrelevan #10799

Merged
merged 2 commits into from
Jan 20, 2025

Conversation

lpranam
Copy link
Member

@lpranam lpranam commented Dec 24, 2024

  • Target version: master

Checklist

  • I have run make prettier-write and formatted the code.
  • All commits have Change-Id
  • I have run tests with make check
  • I have issued make run and manually verified that everything looks okay
  • Documentation (manuals or wiki) has been updated or is not required

Copy link
Contributor

@gokaysatir gokaysatir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, thank you.

@lpranam lpranam enabled auto-merge (rebase) January 10, 2025 12:45
@lpranam lpranam force-pushed the comment_conflict branch 2 times, most recently from bbae1d9 to 3597f74 Compare January 16, 2025 10:44
problem:
when a user is editing comment and makes some changes to the document
text which moves the comment, user used to get comment conflict dialog
without any real changes to comment which confused users

Signed-off-by: Pranam Lashkari <[email protected]>
Change-Id: Ifc6cbe51bc7caecb02a6ac099e6530dded45743b
avoid comment conflict dialog when changes are done by current user itself

problem:
when autosaved comments are still in edit mode and user undo the comment action
user used to get warning "another user removed comment"

Signed-off-by: Pranam Lashkari <[email protected]>
Change-Id: I8578443f6f4e31f441c9e8ce4c77ec276d9a5d6a
@lpranam lpranam merged commit 3193836 into CollaboraOnline:master Jan 20, 2025
13 checks passed
@lpranam lpranam deleted the comment_conflict branch January 20, 2025 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants